Merge from emacs-24; up to r108025
authorChong Yidong <cyd@gnu.org>
Thu, 31 May 2012 06:06:42 +0000 (14:06 +0800)
committerChong Yidong <cyd@gnu.org>
Thu, 31 May 2012 06:06:42 +0000 (14:06 +0800)
commit37856f20665528c834d89be8f051368ad96d1205
tree7c05dbeafd2746173800c5d57e3a7231b3812026
parentab5badb7e37683b170b8f5f342dae28aaf7f5c14
parent1e85afe6d4f461563b5f9b61889ddf05f4c15189
Merge from emacs-24; up to r108025
14 files changed:
lib-src/ChangeLog
lib-src/makefile.w32-in
lisp/ChangeLog
lisp/desktop.el
lisp/emacs-lisp/bytecomp.el
nt/ChangeLog
nt/configure.bat
src/ChangeLog
src/charset.c
src/doc.c
src/keymap.c
src/ralloc.c
src/search.c
src/xdisp.c